d/copyright: drop copyright and license stanzas for files that are in upstream git...

diff --git a/debian/changelog b/debian/changelog
index efbe7c7a72408a9f95724607424a484812a1ea2b..e3ef456598749933c32ac3b73d4e601c6cced4b6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ostree (2016.13-1) UNRELEASED; urgency=medium
       remove, 2016.13 was released with a fixed "make dist"
     - d/p/Filter-bootloader-supplied-kernel-cmdline-options.patch:
       remove, merged upstream
+  * d/copyright: drop copyright and license stanzas for files that are
+    in upstream git but not in tarballs
 
  -- Simon McVittie <smcv@debian.org>  Sun, 20 Nov 2016 15:47:19 +0000
 

diff --git a/debian/copyright b/debian/copyright
index d97db4b30b2cfd9139cd8d90f307bdfc0935b104..56f926d1f249a303e859c6cf6279d12575d09d4a 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,13 +20,6 @@ Copyright:
  © 2015 Canonical Ltd.
 License: LGPL-2+
 
-Files:
- git.mk
-Copyright:
- © 2009 Red Hat, Inc.
- © 2010-2013 Behdad Esfahbod
-License: GNU-permissive
-
 Files:
  libglnx/glnx-lockfile.*
  libglnx/glnx-fdio.*
@@ -53,14 +46,6 @@ Copyright:
  2012 Lucas De Marchi
 License: GPL-2+ with Autoconf exception
 
-Files:
- GNUmakefile
- build-aux/useless-if-before-free
- build-aux/vc-list-files
-Copyright:
- 2001-2014 Free Software Foundation, Inc.
-License: GPL-3+
-
 Files:
  bsdiff/*
 Copyright:
@@ -68,12 +53,6 @@ Copyright:
  © 2012 Matthew Endsley
 License: BSD-2-clause
 
-Files:
- contrib/golang/*
-Copyright:
- © 2013 Conformal Systems LLC
-License: ISC
-
 Files: debian/*
 Copyright:
  © 2015 David King <amigadave@amigadave.com>
@@ -115,24 +94,6 @@ Comment:
  License version 2 can be found in the file
  '/usr/share/common-licenses/GPL-2'.
 
-License: GPL-3+
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-Comment:
- On Debian systems, the full text of the GNU General Public
- License version 3 can be found in the file
- '/usr/share/common-licenses/GPL-3'.
-
 License: LGPL-2+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Library General Public License as published by
@@ -217,21 +178,3 @@ License: BSD-3-clause
  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: ISC
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
- .
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-License: GNU-permissive
- Copying and distribution of this file, with or without modification,
- is permitted in any medium without royalty provided the copyright
- notice and this notice are preserved.